Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

round traits framework + a few placeholders #2876

Closed
wants to merge 22 commits into from
Closed

round traits framework + a few placeholders #2876

wants to merge 22 commits into from

Conversation

harryob
Copy link
Member

@harryob harryob commented Mar 18, 2023

this allows for us to have randomised traits that will impact a whole round for a bit of variety. wouldn't that be nice?

🆑
add: added the framework for random traits impacting the whole round
add: added a number of traits, including flu season, faulty piping, book balancing, illicit dealings, faulty cryogenics, economic boom/slump, temperature change and mismatched squads
/:cl:

these should (if i've done the weighting right) not appear enough to be annoying

also

important

i would like to add more, especially for xenos and i'll be going through some ideas i curated prior to merge

@github-actions github-actions bot added UI deletes nanoui/html Feature Feature coder badge labels Mar 18, 2023
@github-actions github-actions bot added the Merge Conflict PR can't be merged because it touched too much code label Mar 19, 2023
@github-actions github-actions bot added Merge Conflict PR can't be merged because it touched too much code and removed Merge Conflict PR can't be merged because it touched too much code labels Mar 19, 2023
@harryob harryob requested a review from a team as a code owner March 19, 2023 17:23
@harryob harryob removed the Merge Conflict PR can't be merged because it touched too much code label Mar 19, 2023
@github-actions github-actions bot added the Merge Conflict PR can't be merged because it touched too much code label Mar 22, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Mar 22, 2023
morrowwolf
morrowwolf suggested changes Mar 22, 2023
View reviewed changes
Copy link
Member

@morrowwolf morrowwolf left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seemingly non-functional during tests on live.

The round traits modification menu may need to be a bit clearer on how it functions.

The flu round trait in particular was nonfunctional. Second round tests of mixed up squads did not seem to apply trait.

@morrowwolf morrowwolf marked this pull request as draft March 22, 2023 16:25
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Mar 29, 2023
@cm13-github cm13-github added Merge Conflict PR can't be merged because it touched too much code and removed Merge Conflict PR can't be merged because it touched too much code labels Apr 3, 2023
@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Apr 14, 2023
@github-actions github-actions bot closed this Apr 21, 2023
@harryob harryob reopened this Aug 24, 2023
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 24, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Zonespace27
Zonespace27 reviewed Aug 24, 2023
View reviewed changes
code/datums/round_traits/neutral.dm
show_in_human_report = TRUE
human_report_message = "A small bonus has been deposited in the accounts of our personnel by The Company. Seemingly, they want everyone to co-operate with them on this operation."
trait_to_give = TRAIT_ROUND_ECONOMIC_BOOM
blacklist = list(/datum/round_trait/economic_boom)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be slump

code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -15,6 +15,32 @@
return GLOB.not_incapacitated_and_adjacent_strict_state

/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep/populate_product_list(scale)
if(HAS_TRAIT(SSround, TRAIT_ROUND_STANDARD_ISSUE))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this used?

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 28, 2023
@harryob harryob closed this Sep 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zonespace27 Zonespace27 Zonespace27 left review comments

@carlarctg carlarctg carlarctg left review comments

@morrowwolf morrowwolf morrowwolf requested changes

Assignees
No one assigned
Labels
Feature Feature coder badge Merge Conflict PR can't be merged because it touched too much code Stale beg a maintainer to review your PR UI deletes nanoui/html
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@harryob @cm13-github @morrowwolf @Zonespace27 @carlarctg